Don't use function calls in array initializers, as some compilers seem to

Sat Feb  7 01:21:09 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtktreemodel.c (gtk_tree_model_base_init): Don't use function
	calls in array initializers, as some compilers seem to hate this.
	(#133216, Jonas Jonsson)

diff --git a/ChangeLog b/ChangeLog
index 6da0977d3b5ad6d1cc8734200b43ac96c27dcc12..452bb682fe0ebffd7ed0f364fd3f8d5ec160952d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Feb  7 01:21:09 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreemodel.c (gtk_tree_model_base_init): Don't use function 
+       calls in array initializers, as some compilers seem to hate this.
+       (#133216, Jonas Jonsson)
+
 Sat Feb  7 00:06:44 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkaccelmap.[hc]: Add change notification for GtkAccelMap,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6da0977d3b5ad6d1cc8734200b43ac96c27dcc12..452bb682fe0ebffd7ed0f364fd3f8d5ec160952d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sat Feb  7 01:21:09 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreemodel.c (gtk_tree_model_base_init): Don't use function 
+       calls in array initializers, as some compilers seem to hate this.
+       (#133216, Jonas Jonsson)
+
 Sat Feb  7 00:06:44 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkaccelmap.[hc]: Add change notification for GtkAccelMap,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 6da0977d3b5ad6d1cc8734200b43ac96c27dcc12..452bb682fe0ebffd7ed0f364fd3f8d5ec160952d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Sat Feb  7 01:21:09 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreemodel.c (gtk_tree_model_base_init): Don't use function 
+       calls in array initializers, as some compilers seem to hate this.
+       (#133216, Jonas Jonsson)
+
 Sat Feb  7 00:06:44 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkaccelmap.[hc]: Add change notification for GtkAccelMap,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6da0977d3b5ad6d1cc8734200b43ac96c27dcc12..452bb682fe0ebffd7ed0f364fd3f8d5ec160952d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sat Feb  7 01:21:09 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreemodel.c (gtk_tree_model_base_init): Don't use function 
+       calls in array initializers, as some compilers seem to hate this.
+       (#133216, Jonas Jonsson)
+
 Sat Feb  7 00:06:44 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkaccelmap.[hc]: Add change notification for GtkAccelMap,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6da0977d3b5ad6d1cc8734200b43ac96c27dcc12..452bb682fe0ebffd7ed0f364fd3f8d5ec160952d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sat Feb  7 01:21:09 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreemodel.c (gtk_tree_model_base_init): Don't use function 
+       calls in array initializers, as some compilers seem to hate this.
+       (#133216, Jonas Jonsson)
+
 Sat Feb  7 00:06:44 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkaccelmap.[hc]: Add change notification for GtkAccelMap,

diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c
index 7434efd156bebcefb8d300f033ed58ece64a6a89..c9be46409749807754f1937e68e1efa04b3ed7ba 100644 (file)
--- a/gtk/gtktreemodel.c
+++ b/gtk/gtktreemodel.c
@@ -130,11 +130,18 @@ gtk_tree_model_base_init (gpointer g_class)
 
   if (! initialized)
     {
-      GType row_inserted_params[] = { GTK_TYPE_TREE_PATH, GTK_TYPE_TREE_ITER };
-      GType row_deleted_params[] = { GTK_TYPE_TREE_PATH };
-      GType rows_reordered_params[] = { GTK_TYPE_TREE_PATH,
-                                        GTK_TYPE_TREE_ITER,
-                                        G_TYPE_POINTER };
+      GType row_inserted_params[2];
+      GType row_deleted_params[1];
+      GType rows_reordered_params[3];
+
+      row_inserted_params[0] = GTK_TYPE_TREE_PATH;
+      row_inserted_params[1] = GTK_TYPE_TREE_ITER;
+
+      row_deleted_params[0] = GTK_TYPE_TREE_PATH;
+
+      rows_reordered_params[0] = GTK_TYPE_TREE_PATH;
+      rows_reordered_params[1] = GTK_TYPE_TREE_ITER;
+      rows_reordered_params[2] = G_TYPE_POINTER;
 
       tree_model_signals[ROW_CHANGED] =
         g_signal_new ("row_changed",